Fix Xen build with PAE enabled, and a fix to help

domU PAE.
Signed-off-by: Gerd Knorr <kraxel@suse.de>

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index bf196d0b177bd596697141a611b938ba61540004..82b58c16474c457277b5936bbe692aed6a80f196 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -267,7 +267,11 @@ extern unsigned long _end; /* standard ELF symbol */
 #define L2_PAGETABLE_XEN_SLOTS \
     (L2_PAGETABLE_LAST_XEN_SLOT - L2_PAGETABLE_FIRST_XEN_SLOT + 1)
 
-#define PGT_base_page_table PGT_l2_page_table
+#ifdef CONFIG_X86_PAE
+# define PGT_base_page_table PGT_l3_page_table
+#else
+# define PGT_base_page_table PGT_l2_page_table
+#endif
 
 #define __HYPERVISOR_CS 0xe008
 #define __HYPERVISOR_DS 0xe010

diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index b0ee9f80e298ce6d6806038a5ae80eb3bf6ee313..b4a5391ddcae52a9a69a39b2ee4c1a1f1bff3dfb 100644 (file)
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -630,6 +630,83 @@ static inline void shadow_sync_and_drop_references(
     shadow_unlock(d);
 }
 #endif
+
+#if CONFIG_PAGING_LEVELS == 3
+/* dummy functions, PAE has no shadow support yet */
+
+static inline void
+__shadow_get_l2e(
+    struct vcpu *v, unsigned long va, l2_pgentry_t *psl2e)
+{
+    BUG();
+}
+
+static inline void
+__shadow_set_l2e(
+    struct vcpu *v, unsigned long va, l2_pgentry_t value)
+{
+    BUG();
+}
+
+static inline void
+__guest_get_l2e(
+    struct vcpu *v, unsigned long va, l2_pgentry_t *pl2e)
+{
+    BUG();
+}
+
+static inline void
+__guest_set_l2e(
+    struct vcpu *v, unsigned long va, l2_pgentry_t value)
+{
+    BUG();
+}
+
+static inline void shadow_drop_references(
+    struct domain *d, struct pfn_info *page)
+{
+    if ( likely(!shadow_mode_refcounts(d)) ||
+         ((page->u.inuse.type_info & PGT_count_mask) == 0) )
+        return;
+    BUG();
+}
+
+static inline void shadow_sync_and_drop_references(
+    struct domain *d, struct pfn_info *page)
+{
+    if ( likely(!shadow_mode_refcounts(d)) )
+        return;
+    BUG();
+}
+
+static inline int l1pte_write_fault(
+    struct vcpu *v, l1_pgentry_t *gpte_p, l1_pgentry_t *spte_p,
+    unsigned long va)
+{
+    BUG();
+    return 42;
+}
+
+static inline int l1pte_read_fault(
+    struct domain *d, l1_pgentry_t *gpte_p, l1_pgentry_t *spte_p)
+{
+    BUG();
+    return 42;
+}
+
+void static inline
+shadow_set_l1e(unsigned long va, l1_pgentry_t new_spte, int create_l1_shadow)
+{
+    BUG();
+}
+
+static inline unsigned long gva_to_gpa(unsigned long gva)
+{
+    BUG();
+    return 42;
+}
+#endif
+    
 /************************************************************************/
 
 /*